Added MainLayout, Updated other layouts