Layout v1
Resolved conflicts