I think it's the final layout though cause the bedroom is pretty close to some concept art that was floating around for the 360 game. Besides, it'd be a little sad if all Naruto had was a tiny efficiency
![sad.gif](http://www.narusaku.com/style_emoticons/default/sad.gif)
Edit: Oh, the shot of his apartment in Shippuden 7 matches the sketches as well.