Other fixes on navegation.
Minor scope vars name changes oon backlog.