added layout
fixed conflict