More UI focus improvements.