Refactoring and Hourly data UI