Added spring forms and removed unwanted code from xmls