Whitespace cleanup and minor changes to menu system to hopefully take care of some of the issues discussed on #271112