Layout for home setup
Fix merge conflict