Some more stuff.
Some slight UI adjustments.