Added screen size compatibility