new features to dashboard
Merge origin/master