more refactoring

* removed some css redundancy