Change layout to match mocks (wip)