Edit template reorganization
Reorganized table templates
Removed dead code
Removed commented code
Fixes in edit templates
Added add route
Fixed errors
Updates for edit and add pages