- some small fixes in the menu handler