diff --git a/ui/src/app/dashboard/view/ActionsTab.js b/ui/src/app/dashboard/view/ActionsTab.js
index 99e4a0fd2..b28e954e7 100644
--- a/ui/src/app/dashboard/view/ActionsTab.js
+++ b/ui/src/app/dashboard/view/ActionsTab.js
@@ -26,9 +26,9 @@ export function ActionsTab() {
 
     const { path, url } = useRouteMatch();
 
-    const {data: users = [], isLoading: loadingUsers} = useGetNewUsersQuery();
-    const {data: disabledSources = [], isLoading: loadingSources} = useGetDisabledSourcesQuery();
-    const {data: unApprovedSources = [], isLoading: loadingApprovals} = useGetUnapprovedSourcesQuery();
+    const {data: users = [], isFetching: loadingUsers} = useGetNewUsersQuery();
+    const {data: disabledSources = [], isFetching: loadingSources} = useGetDisabledSourcesQuery();
+    const {data: unApprovedSources = [], isFetching: loadingApprovals} = useGetUnapprovedSourcesQuery();
     const {data: unApprovedRegistrations = []} = useGetUnapprovedRegistrationsQuery();
     const {data: disabledRegistrations = []} = useGetDisabledRegistrationsQuery();
 
diff --git a/ui/src/app/dashboard/view/AdminTab.js b/ui/src/app/dashboard/view/AdminTab.js
index 9850231cb..01f5271c9 100644
--- a/ui/src/app/dashboard/view/AdminTab.js
+++ b/ui/src/app/dashboard/view/AdminTab.js
@@ -8,7 +8,7 @@ import { useGetUsersQuery } from '../../store/user/UserSlice';
 
 export function AdminTab () {
 
-    const { data: users = [], isLoading } = useGetUsersQuery();
+    const { data: users = [], isFetching: loading } = useGetUsersQuery();
 
     return (
         <section className="section">
@@ -31,7 +31,7 @@ export function AdminTab () {
                                 onChangeUserGroup={onChangeUserGroup} />}
                         
                     </UserManagement>
-                    {isLoading && <div className="d-flex justify-content-center text-primary"><Spinner size="4x" /></div> }
+                    {loading && <div className="d-flex justify-content-center text-primary"><Spinner size="4x" /></div> }
                 </div>
             </div>
         </section>
diff --git a/ui/src/app/dashboard/view/DynamicRegistrationsTab.js b/ui/src/app/dashboard/view/DynamicRegistrationsTab.js
index 1888301a6..0de7b27d7 100644
--- a/ui/src/app/dashboard/view/DynamicRegistrationsTab.js
+++ b/ui/src/app/dashboard/view/DynamicRegistrationsTab.js
@@ -16,7 +16,7 @@ const searchProps = ['name'];
 
 export function DynamicRegistrationsTab () {
 
-    const {data: registrations = [], isLoading: loading} = useGetDynamicRegistrationsQuery();
+    const {data: registrations = [], isFetching: loading} = useGetDynamicRegistrationsQuery();
 
     return (
         <section className="section">
diff --git a/ui/src/app/dashboard/view/SourcesTab.js b/ui/src/app/dashboard/view/SourcesTab.js
index b21e789a3..d2553b19c 100644
--- a/ui/src/app/dashboard/view/SourcesTab.js
+++ b/ui/src/app/dashboard/view/SourcesTab.js
@@ -17,7 +17,7 @@ export function SourcesTab () {
 
     const [changeSourceGroup] = useChangeSourceGroupMutation();
 
-    const { data: sources = [], isLoading: loading } = useGetSourcesQuery();
+    const { data: sources = [], isFetching: loading } = useGetSourcesQuery();
 
     return (
         <section className="section">
diff --git a/ui/src/app/dynamic-registration/view/DynamicRegistrationCreate.js b/ui/src/app/dynamic-registration/view/DynamicRegistrationCreate.js
index 5d707e32a..521c34801 100644
--- a/ui/src/app/dynamic-registration/view/DynamicRegistrationCreate.js
+++ b/ui/src/app/dynamic-registration/view/DynamicRegistrationCreate.js
@@ -13,7 +13,7 @@ export function DynamicRegistrationCreate () {
 
     const history = useHistory();
 
-    const [create, {isSuccess, isLoading: loading}] = useCreateDynamicRegistrationMutation();
+    const [create, {isSuccess, isFetching: loading}] = useCreateDynamicRegistrationMutation();
 
     const save = React.useCallback(async (registration) => await create({registration}), [create]);
     
diff --git a/ui/src/app/dynamic-registration/view/DynamicRegistrationEdit.js b/ui/src/app/dynamic-registration/view/DynamicRegistrationEdit.js
index 87705c2a7..82981d908 100644
--- a/ui/src/app/dynamic-registration/view/DynamicRegistrationEdit.js
+++ b/ui/src/app/dynamic-registration/view/DynamicRegistrationEdit.js
@@ -15,7 +15,7 @@ export function DynamicRegistrationEdit () {
     const history = useHistory();
     const [update, {isSuccess}] = useUpdateDynamicRegistrationMutation();
 
-    const {data: detail, isLoading: loading} = useSelectDynamicRegistrationQuery({id});
+    const {data: detail, isFetching: loading} = useSelectDynamicRegistrationQuery({id});
 
     const cancel = () => {
         gotoDetail();
diff --git a/ui/src/app/metadata/copy/CopySource.js b/ui/src/app/metadata/copy/CopySource.js
index 8854bdd5f..40f408fb9 100644
--- a/ui/src/app/metadata/copy/CopySource.js
+++ b/ui/src/app/metadata/copy/CopySource.js
@@ -79,7 +79,7 @@ export function CopySource({ copy, onNext }) {
                             </h3>
                         </li>
                         <li className="nav-item">
-                            <Button className="nav-link next btn d-flex justify-content-between align-items-start"
+                            <Button className="nav-link next btn d-flex justify-content-between align-items-start text-white"
                                 onClick={() => onNext(getValues())}
                                 disabled={!isValid}
                                 aria-label="Next: Step 2, Organization information"
diff --git a/ui/src/app/metadata/copy/SaveCopy.js b/ui/src/app/metadata/copy/SaveCopy.js
index 423f3040f..e60073d3b 100644
--- a/ui/src/app/metadata/copy/SaveCopy.js
+++ b/ui/src/app/metadata/copy/SaveCopy.js
@@ -65,7 +65,7 @@ export function SaveCopy ({ copy, saving, onSave, onBack }) {
             <div className="col col-xs-12">
                 <ul className="nav nav-wizard m-3">
                     <li className="nav-item">
-                        <Button type="button" className="nav-link previous btn d-flex justify-content-between align-items-start" onClick={onBack}>
+                        <Button type="button" className="nav-link previous btn d-flex justify-content-between align-items-start text-white" onClick={onBack}>
                             <span className="direction d-flex flex-column align-items-center">
                                 <FontAwesomeIcon icon={faArrowCircleLeft} size="2x" />
                                 <Translate value="action.back">Back</Translate>
@@ -86,7 +86,7 @@ export function SaveCopy ({ copy, saving, onSave, onBack }) {
                         </h3>
                     </li>
                     <li className="nav-item">
-                        <Button className="nav-link save btn d-flex justify-content-between align-items-start" aria-label="Save" onClick={() => handleSubmit(onFinish)()} type="button">
+                        <Button className="nav-link save btn d-flex justify-content-between align-items-start text-white" aria-label="Save" onClick={() => handleSubmit(onFinish)()} type="button">
                             <span className="label"><Translate value="action.save">Save</Translate></span>
                             <span className="direction d-flex flex-column align-items-center">
                                 <FontAwesomeIcon icon={saving ? faSpinner : faSave} pulse={saving} size="2x" />
diff --git a/ui/src/app/metadata/view/MetadataUpload.js b/ui/src/app/metadata/view/MetadataUpload.js
index e6593d326..09868aac2 100644
--- a/ui/src/app/metadata/view/MetadataUpload.js
+++ b/ui/src/app/metadata/view/MetadataUpload.js
@@ -92,7 +92,7 @@ export function MetadataUpload() {
                             </h3>
                         </li>
                         <li className="nav-item">
-                            <Button className="nav-link next btn d-flex justify-content-between align-items-start"
+                            <Button className="nav-link next btn d-flex justify-content-between align-items-start text-white"
                                 disabled={!isValid || saving}
                                 aria-label="Save metadata resolver"
                                 type="submit">
diff --git a/ui/src/app/store/metadata/SourceSlice.js b/ui/src/app/store/metadata/SourceSlice.js
index a6057a13d..48505f328 100644
--- a/ui/src/app/store/metadata/SourceSlice.js
+++ b/ui/src/app/store/metadata/SourceSlice.js
@@ -6,7 +6,7 @@ export const MetadataSourceApi = createApi({
   reducerPath: 'metadataSourceApi',
   tagTypes: ['MetadataSource'],
   baseQuery: getBaseQuery(),
-  refetchOnMountOrArgChange: 5,
+  refetchOnMountOrArgChange: true,
   endpoints: (builder) => ({
     getSources: builder.query({
       query: () => ({