Move views in storyboard
Remove Modals for maps