Updates for new settings page

Requires internal PR to be merged first

@sdougbrown