Reorganize library form handling to support own from elements