consolidated edit settings with search, got rid of scrollbar that comes with modal windows
merged conflicts