Issue #888 - Refactoring reset perspective