Layout improvements and fixed bug with 7d average readout