Fix WaveOverlayContainer being always present
Fix layout of profile top header to match web
Just some clean-ups to make it easier to confirm correct logic