System: Fixes for broken nutupane page.
Merge pull request #2818 from ehelms/systems-fix

System: Fixes for broken nutupane page.