System module front-end code update
Merge pull request #126 from sexnothing/master

System module front-end code update