Shuffle layout a bit to solve the trapped gap problem