update context menu | better storage handling