Right click

Added right click support and refactored url transform