Fixed broken org config, tweaked battery display