Added ability to save analytic and minor layout change