refactor search screens finished