Right Click Menu Fixes