diff --git a/src/components/achievements/views/AchievementBadgeView.tsx b/src/components/achievements/AchievementBadgeView.tsx
similarity index 83%
rename from src/components/achievements/views/AchievementBadgeView.tsx
rename to src/components/achievements/AchievementBadgeView.tsx
index ab83025f..53652658 100644
--- a/src/components/achievements/views/AchievementBadgeView.tsx
+++ b/src/components/achievements/AchievementBadgeView.tsx
@@ -1,7 +1,7 @@
 import { AchievementData } from '@nitrots/nitro-renderer';
 import { FC } from 'react';
-import { AchievementUtilities } from '../../../api';
-import { BaseProps, LayoutBadgeImageView } from '../../../common';
+import { AchievementUtilities } from '../../api';
+import { BaseProps, LayoutBadgeImageView } from '../../common';
 
 interface AchievementBadgeViewProps extends BaseProps<HTMLDivElement>
 {
diff --git a/src/components/achievements/views/AchievementCategoryView.tsx b/src/components/achievements/AchievementCategoryView.tsx
similarity index 88%
rename from src/components/achievements/views/AchievementCategoryView.tsx
rename to src/components/achievements/AchievementCategoryView.tsx
index b739f773..3a6f99f1 100644
--- a/src/components/achievements/views/AchievementCategoryView.tsx
+++ b/src/components/achievements/AchievementCategoryView.tsx
@@ -1,7 +1,7 @@
 import { FC, useEffect } from 'react';
-import { AchievementCategory } from '../../../api';
-import { Column } from '../../../common';
-import { useAchievements } from '../../../hooks';
+import { AchievementCategory } from '../../api';
+import { Column } from '../../common';
+import { useAchievements } from '../../hooks';
 import { AchievementDetailsView } from './AchievementDetailsView';
 import { AchievementListView } from './achievement-list';
 
diff --git a/src/components/achievements/views/AchievementDetailsView.tsx b/src/components/achievements/AchievementDetailsView.tsx
similarity index 97%
rename from src/components/achievements/views/AchievementDetailsView.tsx
rename to src/components/achievements/AchievementDetailsView.tsx
index acb3d76d..a413883b 100644
--- a/src/components/achievements/views/AchievementDetailsView.tsx
+++ b/src/components/achievements/AchievementDetailsView.tsx
@@ -1,7 +1,7 @@
 import { AchievementData } from '@nitrots/nitro-renderer';
 import { FC } from 'react';
-import { AchievementUtilities, LocalizeBadgeDescription, LocalizeBadgeName, LocalizeText } from '../../../api';
-import { Column, Flex, LayoutCurrencyIcon, LayoutProgressBar, Text } from '../../../common';
+import { AchievementUtilities, LocalizeBadgeDescription, LocalizeBadgeName, LocalizeText } from '../../api';
+import { Column, Flex, LayoutCurrencyIcon, LayoutProgressBar, Text } from '../../common';
 import { AchievementBadgeView } from './AchievementBadgeView';
 
 interface AchievementDetailsViewProps
diff --git a/src/components/achievements/AchievementsView.tsx b/src/components/achievements/AchievementsView.tsx
index ded955b3..bdb80aef 100644
--- a/src/components/achievements/AchievementsView.tsx
+++ b/src/components/achievements/AchievementsView.tsx
@@ -1,4 +1,5 @@
-import {
+import
+{
     AddLinkEventTracker,
     ILinkEventTracker,
     RemoveLinkEventTracker,
@@ -8,8 +9,8 @@ import { AchievementUtilities, LocalizeText } from '../../api';
 import { Column, LayoutImage, LayoutProgressBar, Text } from '../../common';
 import { useAchievements } from '../../hooks';
 import { NitroCard } from '../../layout';
-import { AchievementCategoryView } from './views/AchievementCategoryView';
-import { AchievementsCategoryListView } from './views/category-list/AchievementsCategoryListView';
+import { AchievementCategoryView } from './AchievementCategoryView';
+import { AchievementsCategoryListView } from './category-list';
 
 export const AchievementsView: FC<{}> = (props) =>
 {
@@ -108,10 +109,8 @@ export const AchievementsView: FC<{}> = (props) =>
                             selectedCategoryCode={selectedCategoryCode}
                             setSelectedCategoryCode={setSelectedCategoryCode}
                         />
-                        <Column
-                            className="!flex-grow"
-                            gap={1}
-                            justifyContent="end"
+                        <div
+                            className="flex flex-col justify-end flex-grow gap-1"
                         >
                             <Text center small>
                                 {LocalizeText(
@@ -132,7 +131,7 @@ export const AchievementsView: FC<{}> = (props) =>
                                     ]
                                 )}
                             />
-                        </Column>
+                        </div>
                     </>
                 )}
                 {selectedCategory && (
diff --git a/src/components/achievements/views/achievement-list/AchievementListItemView.tsx b/src/components/achievements/achievement-list/AchievementListItemView.tsx
similarity index 88%
rename from src/components/achievements/views/achievement-list/AchievementListItemView.tsx
rename to src/components/achievements/achievement-list/AchievementListItemView.tsx
index 9229eca0..88386f3e 100644
--- a/src/components/achievements/views/achievement-list/AchievementListItemView.tsx
+++ b/src/components/achievements/achievement-list/AchievementListItemView.tsx
@@ -1,7 +1,7 @@
 import { AchievementData } from '@nitrots/nitro-renderer';
 import { FC } from 'react';
-import { LayoutGridItem } from '../../../../common';
-import { useAchievements } from '../../../../hooks';
+import { LayoutGridItem } from '../../../common';
+import { useAchievements } from '../../../hooks';
 import { AchievementBadgeView } from '../AchievementBadgeView';
 
 interface AchievementListItemViewProps
diff --git a/src/components/achievements/views/achievement-list/AchievementListView.tsx b/src/components/achievements/achievement-list/AchievementListView.tsx
similarity index 93%
rename from src/components/achievements/views/achievement-list/AchievementListView.tsx
rename to src/components/achievements/achievement-list/AchievementListView.tsx
index 4a8b8fb1..0d464723 100644
--- a/src/components/achievements/views/achievement-list/AchievementListView.tsx
+++ b/src/components/achievements/achievement-list/AchievementListView.tsx
@@ -1,6 +1,6 @@
 import { AchievementData } from '@nitrots/nitro-renderer';
 import { FC } from 'react';
-import { AutoGrid } from '../../../../common';
+import { AutoGrid } from '../../../common';
 import { AchievementListItemView } from './AchievementListItemView';
 
 interface AchievementListViewProps
diff --git a/src/components/achievements/views/achievement-list/index.ts b/src/components/achievements/achievement-list/index.ts
similarity index 100%
rename from src/components/achievements/views/achievement-list/index.ts
rename to src/components/achievements/achievement-list/index.ts
diff --git a/src/components/achievements/views/category-list/AchievementsCategoryListItemView.tsx b/src/components/achievements/category-list/AchievementsCategoryListItemView.tsx
similarity index 97%
rename from src/components/achievements/views/category-list/AchievementsCategoryListItemView.tsx
rename to src/components/achievements/category-list/AchievementsCategoryListItemView.tsx
index d52a103d..f73c0966 100644
--- a/src/components/achievements/views/category-list/AchievementsCategoryListItemView.tsx
+++ b/src/components/achievements/category-list/AchievementsCategoryListItemView.tsx
@@ -1,6 +1,6 @@
 import { Dispatch, FC, SetStateAction } from 'react';
-import { AchievementUtilities, IAchievementCategory, LocalizeText } from '../../../../api';
-import { LayoutBackgroundImage, LayoutGridItem, Text } from '../../../../common';
+import { AchievementUtilities, IAchievementCategory, LocalizeText } from '../../../api';
+import { LayoutBackgroundImage, LayoutGridItem, Text } from '../../../common';
 
 interface AchievementCategoryListItemViewProps
 {
diff --git a/src/components/achievements/views/category-list/AchievementsCategoryListView.tsx b/src/components/achievements/category-list/AchievementsCategoryListView.tsx
similarity index 89%
rename from src/components/achievements/views/category-list/AchievementsCategoryListView.tsx
rename to src/components/achievements/category-list/AchievementsCategoryListView.tsx
index 38c5615a..c641f623 100644
--- a/src/components/achievements/views/category-list/AchievementsCategoryListView.tsx
+++ b/src/components/achievements/category-list/AchievementsCategoryListView.tsx
@@ -1,6 +1,6 @@
 import { Dispatch, FC, SetStateAction } from 'react';
-import { IAchievementCategory } from '../../../../api';
-import { AutoGrid } from '../../../../common';
+import { IAchievementCategory } from '../../../api';
+import { AutoGrid } from '../../../common';
 import { AchievementsCategoryListItemView } from './AchievementsCategoryListItemView';
 
 interface AchievementsCategoryListViewProps
diff --git a/src/components/achievements/views/category-list/index.ts b/src/components/achievements/category-list/index.ts
similarity index 100%
rename from src/components/achievements/views/category-list/index.ts
rename to src/components/achievements/category-list/index.ts
diff --git a/src/components/achievements/views/index.ts b/src/components/achievements/index.ts
similarity index 84%
rename from src/components/achievements/views/index.ts
rename to src/components/achievements/index.ts
index 576c6357..89f6737d 100644
--- a/src/components/achievements/views/index.ts
+++ b/src/components/achievements/index.ts
@@ -1,5 +1,6 @@
-export * from './achievement-list';
 export * from './AchievementBadgeView';
 export * from './AchievementCategoryView';
 export * from './AchievementDetailsView';
+export * from './AchievementsView';
+export * from './achievement-list';
 export * from './category-list';