Add links to views
Add validation