Consolidated context menu code

Attempting to fix select all include column name bug