style changes, switch to haml & sass
minor bugfix