ug 973436 - Refactor the battery panel using AMD modules