Added DiagnosticMapConfiguration

To configure what to display and where
Refactoring DiagnosticMap to be more generic
Merged Touches display to DiagnosticMap