Revert "WIP style changes to reduce clutter on CP > Menu #3344"

This reverts commit ae4569a85f6b2945cac69d76c1a9a997c05c3968.