fix(layout): make basic flow pass