More UI fixes and updates