structured primitives drawing code
indentation fix :)
added mouse move event