Add sorting and move shorten bar to the top
changes
pulled jenny's updates