Refined menu features
Merging with latest