Fixed main menu functionality