edit to search and user login