Fixing scaling, adding alarm indicator graphic and number