SPA links fixed, page links updated