Mostly style and iPad updates
