More changes to settings and modals