Fixed some margins (related to issue 7053)