converted most views to haml