Updated with searchview and touch for tabs