Fix remaining links in main view