Fixed Block DnD and remove bug when there is inner blocks