Review button, better drag and drop, and description tooltip
merge conflict