Minor cleanups. Evaluating use of icons.