added layout, correct