Reverted to default layout w/o includes