Move layout to its own file