clean up stylesheet
try to merge conflicts
little more styling