moved table button and form into directives