Revert "Merge pull request #1528 from PaulL1/header_and_column_menus"

This reverts commit 48419d484601406900a1fc83847a825a375ce985, reversing
changes made to beb57624d335471a1d07945882e91513c1fb4ce6.