EnergyClock View Improvements..