Cleaned up views; change to AMI model