Modified disputes comments combo boxes
Merge branch 'working'