analytics page and few cosmetic changes