Improved main menu items. Fix #58