minor edits
merged menu