Don't unhighlight on view close and refactoring #29