Changed UIBarButtonItems from text to icon. (A)
Some cleanups.