Issue #5 - Fix the navigation in the Site