Switch to a more general layout