fix collision util and the layout files after they broke