Fixes for single screen display style