Improved switching between databases/interaction basket
Cosmetic upgrades