further changed menu-structure