Updated layout and config