Attempting to fix up user experience on settings