Fixed some constraints for smaller devices