Integrate the new layout for AMI setup