Revert "Revert "Album viewing and creation works again""

This reverts commit a583a08c373bbca3b05d6049215d8eb3ee0898fd.