more cleanup, remove broken zoom
wip for drag and drop