add layout to all forms
Merge branch 'develop' of github.com:code-for-india/Akshaya_Patra into develop