Several minor changes related to UI