Remove layout classes and use OOCSS abstractions