Added sorting to all tables