few adaptions and new, but disabled menu items