Analytics, menu fixes