Improve battery and wifi monitors