Added 'system' to name on main screen
Merge in changes from master branch on github