small fixes, switching to haml now
converted views to haml