Reorganized the layout to include the light element.