Fixes: #2397 cleaned SnapshotHandler
Fixes: #2566 SnapShotDialog now using Snapshothandler