Continue on the existing UI-cleanup branch. Create: - Tabs for the settings modal (make general component out of tabs)
Continue on the existing UI-cleanup branch. Create: