1. Add popup menu for right tree
2. Fix