Refactor, fix data display.