add drag indicator, some other improvements