Rolling back...
Adding missing layouts.

Adding metadata for layouts.