did alternate layout
painting title
Merge branch 'ethan'