minor names changes (only for you to captive in "Services")
Merge remote-tracking branch 'ta/master'
fix dashboard page
Merge remote-tracking branch 'rt/master'
step2 change