bug 10 - UI cleanup.  Version 1.