Added all functionalities with infographics and national data