Small refactoring. Added draw layers to models.
Merge remote-tracking branch 'origin/master'