navigation and question improvements