Move js to logic.
Fixed issues that has been displaying
Merge remote-tracking branch 'origin/master'