More shifting of code around for the live dashboard