Further refactoring of css to make it more Atomic

Removing some classes in favor of less class specific defitions.