EnergyClock-View Updates... Bug Fixes and overall Improvements