Fixing some layout margin/padding issues