National, nil: updated navigation, small visual & content fixes