starting to cleanup+style map controls.