Added layout and config