Front end fixes for forms
Merges