Modified the settings view to be easier to maintain