fix #31146
fix #33726
fix margins of inspector