reorganize stylesheets and markup