testing fullscreen display
Test complete
Merged two branch