CON-2176 | moved borders/pipes to the right/EOL