Layout improvements. Update avalanche to 2.1.*