Working on bugs with subsystem edit form