Haml update

There are a few things wrong, I think, but I've made the HTML changes. You should get the server running.