Continuing work on some menu handlers