simplify and improve some of the display