Fix issue #1 - Navigation links are not updated