Revert b134794..fe1753d

This rolls back to commit b1347949faa1fc820004900b532d38bad33acb03.
Fixed MainLayout