New layout and menu structure