Fixing a lot of the UI to restart. Still don't have it right, but at least it's usable.