Added context menu. Fixes several