Bootstrapped the UI up a bit and ditched a lot of cruft.