attempt to fix issue2, changed to base.url and links to base.url