Changed layout to use include files