#261 More CSS refactoring