Prepping for submission with UI improvements for iPhone