[Feature] Authoring forms Re-Write