Cleaning up the UI.  Trying to get things working consistenly across iPhone and Android.