fixes for menusystem