Tweaked markup of settings