- added saving/restoring of display and display gauges view
- some refactoring