Improved workflow/layout of light activity