Layout v0.1.2 w/ fill