Extra tweaks for form based presentation