Fixing layout. Improving cube.