Add shape drawing, and fix text