layout changes
fixed conflicts
fixed conflcits