Enhance  && fix drag n drop blocks