Add settings headers, reorganize settings for listing order