Minor tweaks + pass through api token to subwidget