TouchMapper + visual changes
Ammend of last commit