Updates to GUI and Core
Merge branch 'master' of github.com:domasmar/os1