More refactoring. Removed F1 menu.