second attempt at getting rid of iphone styles
Syncing Becca Branch with new master