cleaned the layouts with includes, still in work