Further work to make it look nice on iPhone