Refactoring record view