Some refactoring done + multiple drag and drop tracks