Consolidate all to tabs

I ham having issues with Photoshop 21.0.2. Photos are not opening as tabs and even when going to window>arrange>consolidate all to tabs, it still doesn't work. The menu bar is also different than it was before I upgraded  ( see atatched image) and I cannot seem to change this. In preferences, under workspace, I tried deselecting "Enable floating documaent window docking" which made no difference. What am I missing? I frequently have multiple images open at once and even though there are always work-arounds, this is extremely frustrating. I had my workspace set up exactly like I wanted it and now I can't get back there.