Next steps in moving to flat layout