Analytics. Some UI improvements