Fixed a series of Display Issuesp