1. Modify xml for new UI layout.
2. Fix typo.