Osng 507

This pull request contains the changes about the sorting arrows.