Improved the classes

Reduced the amount of classes which will be in the markup. Should make
it easier to add new columns as well.