finally fixed the whole menu!