Re-organized into 1 main + 2 subviews; click handler for map areas