Cleaned up layouts with includes