Sorting fix & user registration updated