Final Commit to layout