Fixed some margins