Adding Delete link to Form
Refactored all files