menu change and minor edits