Revert some file and fix battery view