Fixes to Shutdown and Reboot displays