Todo cleanup
Rounded corners for drag warn