Some refacoring; Proper relative/absolute urls