BZ-8867 refining dashboard code