Some more design tweaks.