Final commit

Positioned things in complex draw