Small fixes

Note that, I renamed "Toggle sort direction" to "Toggle Sort Order", because it looks/sounds better IMO. It is an optional change though.