A few ui fixes so editing is a bit more stable