Allow optional display of upper case letters.

Plus refactoring and tablet display improvements.