update code in clicking rates in login and menu
Merge remote-tracking branch 'origin/master'