nouveau layout
Revert "nouveau layout"

This reverts commit d84e9af2c5519dee35c894e5bc0c0423d6e32793.