Remove drawable and fix shapes
Add label to avoid warning
Renumber parts
Merge pull request #3 from lpw25/fix-classes-async

Fix classes async