System form compoent update
System form update
Merge pull request #914 from sexnothing/develop

System form compoent update