Feature/menu fixes