Add navigation links on all pages; fix some bugs