url fixes and template tweaks