correct margin/padding issues