Commented javascript out
Switched chart order
Updates
Merge pull request #445 from bellotastudios/updates

Updates