simplify album logic, add album links to map view