integrated all operators and viewers into one viewer, updated where necessary