album and picture model changes to add generate and add new ordering