Handled reproduction number error, and added close X button

Previously, the expected number of new cases number was based on the probability of infection with short-range interactions, which is wrong.

This MR changes the way we calculate the expected number of new cases to consider the probability of infection without short-range interactions, if any.

Added as well a close button to the short-range interactions dialog, in the top right corner: