Some stylesheet refactoring