adding icon support and clickable metric drawing