Made layout into template with includes