Change photos and album logic, remove static functions