Thread:MarvelPhx/@comment-26692787-20170613232126/@comment-26828130-20170614082239

We have to redo the menu anyway, so why not reorganize while we're at it