added units collection
changed to fetch page from unit
page routes not hardcoded anymore
implemented logic to move to the next page until it reaches the result