more stylesheet refactoring