Add comment & cleanup
Add rigth click support
Fix bug
Fix bug
UI fix