PROV-505 preserve next/prev button function when switching view modes