More work on analytics page