Add URL field, and minor UX improvements