Added Search. Solved minor interface bug