still trying to fix the baseurl and url links