Namespace variables for each tab in settings modal

- Updated TODO