Work-in-progress

Completed some UI stuff.