tweak appearance of indicators
Make add blocktype work with new drag stuff
Merge