Updates for style fixes by Alex and for iPhone issue