changed url to baseurl for easier serving, some minor style fixes