#28 Another redesign to display more information better