multiple changes

updated links in navigator
completed expression language