update to use haml templates