Improve FormWorkspace

Improve FormWorkspace