Minor edits to UI.
Resolved merge conflicts.