Correct navigation and add lib file