Refactored Dashboard and CIC to use a common codebase.