Revert "Make viewer simplified." - fix issues first

This reverts commit 82a7b3b04dbd206dfba90137197cbf148689f222.