modified controllers - added resolve funcs, implemented service: form-service