change to base url and link fix