Add border and cell spacing