Change manual system add form to be more compact.
Merge branch 'system_add' into develop