More artifacts UX cleanup per feedback