Adding menu fixes