improve forms element after internal review