trying to fix behavior post r38, removed tabs in favor of pages, still issues