context menu base, bug fixes