add lighting
ui refactoring