Screen manager changes, few lighting optimizations and other small changes

Signed-off-by: Sam Hellawell <sshellawell@gmail.com>