#261 Refactoring of CSS