Merge fix - Added back percentage toggle