Changed as many urls to be url_for()