Updated layout and strings