diff --git a/ui/src/album/AlbumGridView.js b/ui/src/album/AlbumGridView.js
index ea7d2c06d..a52984652 100644
--- a/ui/src/album/AlbumGridView.js
+++ b/ui/src/album/AlbumGridView.js
@@ -32,7 +32,7 @@ const useStyles = makeStyles((theme) => ({
 
 const getColsForWidth = (width) => {
   if (width === 'xs') return 2
-  if (width === 'sm') return 4
+  if (width === 'sm') return 3
   if (width === 'md') return 5
   if (width === 'lg') return 6
   return 7
diff --git a/ui/src/album/AlbumListView.js b/ui/src/album/AlbumListView.js
index d772a29a2..eaa10e42d 100644
--- a/ui/src/album/AlbumListView.js
+++ b/ui/src/album/AlbumListView.js
@@ -35,6 +35,7 @@ const AlbumListView = (props) => {
         render={(r) => (r.albumArtist ? r.albumArtist : r.artist)}
       />
       {isDesktop && <NumberField source="songCount" />}
+      {isDesktop && <NumberField source="playCount" />}
       <RangeField source={'year'} sortBy={'maxYear'} />
       {isDesktop && <DurationField source="duration" />}
     </Datagrid>
diff --git a/ui/src/i18n/en.js b/ui/src/i18n/en.js
index f35d77e0b..9e3654f9a 100644
--- a/ui/src/i18n/en.js
+++ b/ui/src/i18n/en.js
@@ -8,7 +8,8 @@ export default deepmerge(englishMessages, {
       fields: {
         albumArtist: 'Album Artist',
         duration: 'Time',
-        trackNumber: 'Track #'
+        trackNumber: 'Track #',
+        playCount: 'Plays'
       },
       bulk: {
         addToQueue: 'Play Later'
@@ -17,7 +18,9 @@ export default deepmerge(englishMessages, {
     album: {
       fields: {
         albumArtist: 'Album Artist',
-        duration: 'Time'
+        duration: 'Time',
+        songCount: 'Songs',
+        playCount: 'Plays'
       },
       actions: {
         playAll: 'Play',
diff --git a/ui/src/song/SongList.js b/ui/src/song/SongList.js
index 880ebf7e5..6466a916f 100644
--- a/ui/src/song/SongList.js
+++ b/ui/src/song/SongList.js
@@ -10,7 +10,8 @@ import {
   SearchInput,
   Show,
   SimpleShowLayout,
-  TextField
+  TextField,
+  FunctionField
 } from 'react-admin'
 import { useMediaQuery } from '@material-ui/core'
 import {
@@ -93,7 +94,10 @@ const SongList = (props) => {
           )}
           <TextField source="artist" />
           {isDesktop && <NumberField source="trackNumber" />}
-          {isDesktop && <TextField source="maxYear" />}
+          {isDesktop && <NumberField source="playCount" />}
+          {isDesktop && (
+            <FunctionField source="year" render={(r) => r.year || ''} />
+          )}
           <DurationField source="duration" />
         </Datagrid>
       )}