Fix many UI problems