added column vertical border
modified left column
fixed merge conflicts