Added includes and default layout