Improving analytics page