further UI updates, getting close