Still trying to fix device width