Basic Navigation Framework and Model. Improvements to ViewLocator