Make the UI better and allow for trending and normal display