WATERSMART-277

Some changes unrelated, but mostly moving map controls to a common area.