Fix URLs and navigation