To be honest, the layout has never bothered me too much. And with the recent furniture refresh and the first wing, everything is in a reasonably new condition.
The biggest issue I have is with the catering.
The troughs of brown slop on the buffet hardly scream premium at me. More school canteen.
The recent addition of the afternoon tea table as you enter the eating area is a good start.