Modified base_components to contain elements on layers 2 and 20