Bug fixes.
Added labels to modals (Task 4) and info windows. Squashed some bugs.