Fixes and added drag event