Dashboard fix
Merge branch 'greg'