Sexy new light layout and a bunch of layout fixes and optimizations