Updated the layout / fixed the soldier collision-scale bug