Fix workspace form
Workspace form fixes