Simplify UI; add 'Close' button to some dialog boxes.