analytics + cosmetic tweaks