some margin fixes