Layouts mostly done
Merge branch 'master' of github.com:chrisjleaf/plannedParenthood