Added custom right click implementation