Sync'd and ran

Just downloaded and ran the app. A few files updated as a result. No
code/xml changes.