Cosmetic changes and some display rework.