Merge branch 'ui'
Preparing for new class diagram, SpinWindow removed