Working through necessary UI

Working through necessary UI growing pains.