Improve click/touch detection
Revert to separating .drawer-butt and content classes