More bug fixes on dash board