Use new baseurl style to fix the linking problem