Add handle indication on search page, improve design