fix layout and menu navigation.