UI fixes and analytics tracking