- implemented sorted switching between tabs
- clean-up of the API