Making revisions requested by Aaron.
More minor changes to UI.