Added some more actions and cleaned up views.