Fix margin errors