FLUID-4686: Cleaned up models for setting panels.