Review light shape UI panels code.
Update some class names