Fix drag; Minor update to UI