Fix margin issues