Only display necessary columns + refactoring