Added menu fixes mentioned in last commit, they were somehow automatically removed from the rebase.