Fixed the views and controller actions (closes #149 #137)