more haml conversions w/styling, tests