Moved some stuff around on the board