Fixing margin: Take 2