Re-worked UI, Added basic analytic capabilities