Fix random js syntax issue.
Final (?) fixes to message navigation in topic.
Merge branch 'master' into MNF