Fixed #6289
Refactored CSS file according to #6167
Fixed #6167
Fixed lints