Move some nodes to better placements

Text was overlapping with the nodes