yber fixes
Merge branch 'ui-mocks' of https://github.com/miknei/massive-computing-machine into ui-mocks