Removing layout again, need a larger archictual change to work