Improving transitions, fixing more bugs w/ drag and drop