Bug fixes for the displaying on various screens