Update to Mainview layout