UI fixes and functionality