Feature/plotting reset

closes #831