working on unit page and search