Drop down menu
Merge branch 'dropdown'
Cleaned up comments. Made map code cleaner.