CORE-347 dashboard changes based on my previous PR