Remove monkey patch not needed anymore
Fix margins logic