Fix up the god awful UI at least a little