Tidy up context menus and add some refresh capabilities