More changes

Completed the Javascript section
Cleaned up the Templates section