Improves menu
Fixes merge