Split organization model and analyse view, and categories fixes
Activities chart and fixes