Fix tagging, and minor UI enhancement.

Tagging works now, and the MainControl UI is not quite as tiny.