added pairing timeout and some UI fiexs