popup menu / bug fixes