#27 Change the logic of screen size Hanappe.