layout and menu fix