main menu basic functionality
merged conflicts