Merge "New UI..." into gb-ub-photos-arches