DISCL-235: Code review Friday refactorings

This is preliminary draft review
Fixed, I also moved the rendering code for Skeletons out of the GLWindow.