Code cleanup.  Major UI fix for pre-ICS devices