Function changes for working with new Display screen
Merge remote-tracking branch 'origin/master'