Tidyup, ready for optimization
Implemented DrawRect optimization
Merge branch 'graphics-improvements' into dev