Move "Charge Percentage"/"Energy Consumption" switch to below the graph

Bharadwaj Rajurequested to merge
work/bharadwaj/energy-better-layout into master

Now it's clearer that it applies to the graph.

Merge request reports