added menu, moved refresh button to menu item, cleaned up a bit