Added MapScreen, buttons in MainPage