Minor tweaks regarding input and button focus.