Minor update to settings ui

comment remove
Merge remote-tracking branch 'origin/settings' into next