added some layouts and a light reorganization