changes to haml and sass structure