Reworked entity collision and rearranged assets