Move Display sort order button and some other small fixes

This fixes #5