Work on UI

Continued progress