some fixes in navigation and focus
Merge pull request #1826 from diegosarmentero/master

some fixes in navigation and focus