Fixed path issues and added baseurl