Fix edit URL
Better field validation
Add redirect logic