Refactor search menu directive and top screen