Readability related refactoring.
Sort dialog: controls disability related fixes.