Combined display nones.

Made all the classes that don't want to be seen hang out together in one spot.