refactoring some of the styles and markup, rearranging layout a bit more as well