Cursor on contact button added and code cleaned up