some fixes in navigation and focus