Some further UI updates