Added more complete layouts and config