Gui Changes + error fix in tests
Merge branch 'master' of https://github.com/Karatekiwi/sbcm