Move layout back to one file