UI layout changes.

These are the changes I proposed during PiE work session today. Will
continue to refactor.