Fix: Crash on multiple click on menu buttons
Minor changes