Cleanup, haml, header-footer partials