Added a toolbar, cleaned up menus etc.