Faster looping, fetch only light data, refactor icons