Several changes for SetUp window.
Merge branch 'master' of github.com:THaslbauer/SoPra