further UI work