Charts fixed for Index page some improvements and bugs fix