Feature/app form fixes

check itout