Attempt to clean up display and fixing methods to do so.