Added sorting and some updated styles