refactor stylesheets
merged github edits