Improved menu and removed naming errors.