Merge pull request #1236 from JordanAMeyer/master

Edit Menu Overhaul