Added optional fields to Software
Moved hidden field outside the template.
Improvements on test entries