Integrate the new layout for AMI setup
Tweak AMI
Add period to warning on AMI settings page
Merge branch AMI into next