Remedied magic values/hacks in Viewer classes