added haml and converted views