batch of UI immprovements