Fix analytics (to split)
WIP charts
WIP on display
Fix state