Added sorting and styles