Further todos work, slight UI tweaks.