Optimized AlbumGrid a bit