VID-1478 margin-right, a better solution by @lizlux