Master Display Changes Added

To help with merging this prototype back into the main build with full bug testing