Fix file references. reduce boxes spread