Minor changes and fixes with forms

-
Merge branch 'alisha' of https://github.com/QRAAT/QRAAT into alisha
Minor changes.

-
Merge branch 'alisha' of https://github.com/QRAAT/QRAAT into alisha
Merge branch 'alisha' of https://github.com/QRAAT/QRAAT into alisha