Tree view fix, basket popup fix