added validations and better links