Template updates and changin all files to haml