Final check_in before the app goes for user studies.

Major UI changes.