Updating strings to match generic changes
Moving javascript into it's own unit out of template