Cleaned up display some more