Enhancement to PhotoLayout