Zoom and +, - buttons working correctly...

for simple shapes.