Design for solutions & problems

This would almost finalize the design