Fixed the fix for the margins