Added sorting, rearranging of list