[DEPARTAMENTO] Fixing the viewer, working on the natural flow