DeviceWidth to Width for MQs

Reverting all changes from DeviceWidth to Width for MQs - causes issues
on mobile with screen resolutions higher than their device.