Fix initial display
Cleaned handling of the setting value
Fix initial sort handling
Fix error handling
Border must be rendered after we updated the sort order, not before
Merge remote-tracking branch 'upstream/master'