Re-arrange join output to keep the first columns the same as before