[^] Some UI changes