Minor layout and behavior tweaks.