Make master/detail work for Albums/Photos and general tidy up.