Add missing file + fix layout issue when photo set layout returned is not valid