improvements
bugfix
change state of menu items