Use new URL helper in a few more views