Cleaned up main menu code (finally ...)