Merge "More menu fixes" into gb-ub-photos-bryce