Drag and drop and site order (fixes #1)