Started refactoring of GUI
Merge remote-tracking branch 'origin/master' into TextureRefactoring