Start on layouts for galleries. Do a lot of cleanup to get test cases running.