ADD - Dashboard refacto and billing