More tiny tweaks, remove 'Apply Settings'