Update Display.java

General cleanup, and override button now in a working state