Feature/form bugs

Close #29