Some gui changes
Merge branch 'master' of github.com:jonixj/emix