added layouts for phone
fixed conflicts