Updated layout, resizable