Misc changes
Implement drop button

Ported the drop button from the old version