with ui changes for forms
Merge branch 'master' of https://github.com/depuginde4119/nswebsite