added right margin and highlight whitespaces