fixed critical issue with long press, fixed arrow views added twice
cleanup for maintainability
Merge remote-tracking branch 'origin/master'