* Fix the context menu * Remove unnecessary overrides * Clean up formatting/naming * Factor out base class for shared behavior