Changes for new layout and count-inventory added.