Fixed more sensible margins