Fixes to form layout code.