Reworking UI

6/10/03