Add navigation and improve menus.