Fixes for field spacing when headings are hidden