Merge "3 button nav is laid out correctly." into main