Fixes Context Menu Options for Components

Went through each component with Nathan to remove extraneous options and fine-tune which options appear where.

Branch can be deleted.