shape ordering
picture resizing
code cleanup
fixed blinking when adding shapes