Final UI tweaks.
Merge Lyle's commits.
iPad UI work