Finish url_for; improve url structure