Finished sort for users along with issue #1 fixed