Added some popup menus