Updated MainPage layout