adjust layout

[#67501316] moved some pieces around. removed some old code