Fixes from PR comments

- remove comment
- add cursor-pointer
- better organize javascript