Updates for flat layout.
New flat layout.