fix and features

fix
# expire
feature
# drag and drop