Finished converting all views to haml