new menu and finished main layout