Clean up display stuff a little better on Android.