Added sorting, CSV upload