Moved top and bottom columns into one class