Light refactor for lunar-layout.