Further hacking of UI. You know, comments would have been really useful in some places.