Changed the way the screen messages work