testing cubes commit
Updated UI, fixed some bugs