migrate to haml
some fixes