More bug fixes and iPad UI improvements