Fix tabbed form navigavation and percentage sort