Dashboard changes corresponding to Bug 46 and 51