Improved rendering logic
Merge branch 'modelloading' of https://github.com/Shada/edit87 into modelloading