Some minor ui fixes