* Improved the system viewer