Updated UI to be more easily controlled

Not a perfect implementation, but a large improvement. Cleaned up some
other code.