Fixing bugs

Now able to draw shapes