Made some changes to make the display better