Amend: Fixed menu mix up and making sure perspective bar is on by default
Change-Id: I0c19e5fbf0f0d29cdca0f63afb33ca964a145b94
Former-commit-id: b91b706701 [formerly b91b706701 [formerly 53e42aa3925399271cc3ad4ee964476ddffc8eb6]]
Former-commit-id: 1d3c378dde
Former-commit-id: e05c12e246