UI various corrections