CMS-1091 Space Manager - Form fixes