UI fixes and general fixes