make Viewer the central class
some minor changes (includes, const, ...)