Menu fix + minor