Added right-click blocker
Merge remote-tracking branch 'origin/master' into layout