Added sorting and new styles