Added right column border
Added a commented option of noswap