Slighlty update the display and rewrite some of the code