Moved draw code to respective items
Merge branch 'dev' of https://github.com/tabenmalik/Project-Snowball into dev