Minor tweaks

Loading from the repository and not from JavaScript version, corrected
the focus directive to be more generic.