viewをある程度まで整えた
Merge branch 'takahashi/fixViewsOverall'