Updated: tweaked the menu and added icons