Refactoring/split result ui