Added columns, played with borders and margins