Cleanups: Use URL names and url template tag