Layout and Navigation JS module updates