Added some menus and popups