Add, Remove and Edit Shapes