dashboard tunning
Merge origin/master