More work on full screen mode