clickable overview and some improvements