Fix/tweak draw and mouse events