Improved viewer view again