(#5) - finally fix hard-coded urls

And fix some minor html crap