Refactor ContextMenu

Temporary direct imports of Silica components removed