Removed root_navigation_model and fixed xml views #5479