A bit of cleanup and polish on the UI framing, to prep for adding controls