added layouts
fixed conflict