General clean up of layouts