further UI enhancement