Fix issue #7 and update navigation