layout complete
Minor changes around git merge