UI fixes from user testing session.