Fix right margin position on all systems