Branch/kinetic touch

@eric79 
I never even got around to testing the touch, but these changes need to be made regardless
Doing so pushed the line outside of the margin that I've set, so I left the line as is.