css and markup cleanup WIP