Data refactor
UI and padding