updated layout
oops fixed merge conflict. pushed too early