Right style dropdown, add menu options, move map control