changed all views to haml
added new model :D