fix alarm color rendering on main screen
Commenting improvements