Various UI updates and improvements