removed navigation and promoted to library code
rolled back navigation changes