Improvements for full screen mode