switch to haml + big rearranging