Add AlbumActivity
refactoring