Tidy up
Add url validation for Link