Added a bit more stuff to display