Reworked display and data
Updated to new display engine