Fix margins harder