Viewer: New design and some minor bug fixing...