Consolidated the solution banner and the challenge prompt banner into a single class.  Still some work to be done on this.