further UI improvements