Updated haml views

This branch has all of the updated HAML views.