Revert "Revert "layout changes""

This reverts commit f160bdd416535314d6d250e1716215dc9bc3fb11.