started reworking of menu structure