Changed layout and menus