Result view refactoring