fixing few changes for forms