Also move context menu logic into separate classes