Fix dnd
Add more shapes