lots of bug fixes, another pass on iOS' new layout.