Feature/conditional forms js mod