Added new simpler layout and menu