refactoring light layout