Minor changes to tab navigation in controlform