Fix unit collision, added border showing which player's turn it is