fixed links and still working on location page