Merge pull request #708 from NiLuJe/master

A bunch of tweaks
fix: crash on emulator when trying to display battery level
Merge pull request #710 from houqp/houqp-master

fix: crash on emulator when trying to display battery level